Merge from emacs-23; up to r100544.
authorGlenn Morris <rgm@gnu.org>
Sat, 9 Apr 2011 17:40:29 +0000 (10:40 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 9 Apr 2011 17:40:29 +0000 (10:40 -0700)
commit332ce10139535723166b04b52ac6d34da7fefe94
tree05cfdc5d5f5aa14ad56e4f8c7c1ffbcb345f0f7c
parentb46e68d3a7cb56981e6e8d3940aa6b494caa4179
parent4b9f558a64646dca796a0a44211c644484be103e
Merge from emacs-23; up to r100544.
lisp/ChangeLog
src/ChangeLog
src/ftfont.c
src/xmenu.c
src/xselect.c
src/xterm.c